fix compile warning. (#122727, patch from Kjartan Maraas).

Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
	(#122727, patch from Kjartan Maraas).

diff --git a/ChangeLog b/ChangeLog
index bbb3b7b3afa8f009eaf8ac867fb39783df272702..57fbcb5cecb28cdff42ffa1ca45cf2f11cc04961 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
+       (#122727, patch from Kjartan Maraas).
+
 Wed Dec 17 21:23:01 2003  Kristian Rietveld  <kris@gtk.org>
 
        Yay! Fixed height mode! Hooray! (Part 2 of #80868).

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bbb3b7b3afa8f009eaf8ac867fb39783df272702..57fbcb5cecb28cdff42ffa1ca45cf2f11cc04961 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
+       (#122727, patch from Kjartan Maraas).
+
 Wed Dec 17 21:23:01 2003  Kristian Rietveld  <kris@gtk.org>
 
        Yay! Fixed height mode! Hooray! (Part 2 of #80868).

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bbb3b7b3afa8f009eaf8ac867fb39783df272702..57fbcb5cecb28cdff42ffa1ca45cf2f11cc04961 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
+       (#122727, patch from Kjartan Maraas).
+
 Wed Dec 17 21:23:01 2003  Kristian Rietveld  <kris@gtk.org>
 
        Yay! Fixed height mode! Hooray! (Part 2 of #80868).

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bbb3b7b3afa8f009eaf8ac867fb39783df272702..57fbcb5cecb28cdff42ffa1ca45cf2f11cc04961 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
+       (#122727, patch from Kjartan Maraas).
+
 Wed Dec 17 21:23:01 2003  Kristian Rietveld  <kris@gtk.org>
 
        Yay! Fixed height mode! Hooray! (Part 2 of #80868).

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bbb3b7b3afa8f009eaf8ac867fb39783df272702..57fbcb5cecb28cdff42ffa1ca45cf2f11cc04961 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Dec 17 23:16:45 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning.
+       (#122727, patch from Kjartan Maraas).
+
 Wed Dec 17 21:23:01 2003  Kristian Rietveld  <kris@gtk.org>
 
        Yay! Fixed height mode! Hooray! (Part 2 of #80868).

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 1cbb3e9e835946008e60206f8415c33c041e44cb..ee5ee4128a3dcf9e20879505466237c7af2dc9f4 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2214,7 +2214,7 @@ gtk_tree_view_button_press (GtkWidget      *widget,
       /* Save press to possibly begin a drag
        */
       grab_widget = gtk_grab_get_current ();
-      if ((grab_widget == NULL || grab_widget == GTK_WIDGET (tree_view)) &&
+      if ((grab_widget == NULL || grab_widget == widget) &&
           !column_handled_click &&
          tree_view->priv->pressed_button < 0)
         {